Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Sep 2011 00:28:42 +0000 (17:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Sep 2011 00:28:42 +0000 (17:28 -0700)
commite6687869f706d746acc0a307b1d355e2c34c10d7
tree35c5a1abad3d203153c111c8e5cf2f219d712275
parent42a4d1c50f66249a83f5af0a7c0f239e41886a3e
parent45ef0875b4f2afa1029ae25d3e9d46842414e7dd
Merge from trunk.